From cbcaccb5e991155a4ae85a032e990614c3dc6960 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 5 May 2017 17:38:19 +0100 Subject: [PATCH] x86/pv: Align %rsp before pushing the failsafe stack frame Architecturally, all 64bit stacks are aligned on a 16 byte boundary before an exception frame is pushed. The failsafe frame should not special in this regard. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Julien Grall --- xen/arch/x86/domain.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ef8c05a60b..13cdc504dd 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1743,9 +1743,8 @@ static void load_segments(struct vcpu *n) struct pv_vcpu *pv = &n->arch.pv_vcpu; struct cpu_user_regs *regs = guest_cpu_user_regs(); unsigned long *rsp = - (n->arch.flags & TF_kernel_mode) ? - (unsigned long *)regs->rsp : - (unsigned long *)pv->kernel_sp; + (unsigned long *)(((n->arch.flags & TF_kernel_mode) + ? regs->rsp : pv->kernel_sp) & ~0xf); unsigned long cs_and_mask, rflags; /* Fold upcall mask and architectural IOPL into RFLAGS.IF. */ -- 2.30.2